Frank Hippmann updates hsa_ndv.c to quote output with CDATA and updates

MSVC build files.

diff --git a/gpsbabel/hsa_ndv.c b/gpsbabel/hsa_ndv.c
index 5fad20f30518575d33f2644c456c8a6ee9d3cee8..d52452048e8ec683de29f1598eba3098f3227537 100644 (file)
--- a/gpsbabel/hsa_ndv.c
+++ b/gpsbabel/hsa_ndv.c
@@ -309,9 +309,8 @@ hsa_ndv_waypt_pr(const waypoint *waypointp)
 //     fprintf(ofd, "\t\t\t<FeatureNameAgency>0</FeatureNameAgency>\n");
 //     fprintf(ofd, "\t\t\t<FeatureNameSubDiv>1</FeatureNameSubDiv>\n");
 //     fprintf(ofd, "\t\t\t<FeatureNameNumber>1089009023</FeatureNameNumber>\n");
-       fprintf(ofd, "\t\t\t<Attr>attr=grpnam%s\x1ftrnrad50\x1fOBJNAM%s\x1flegnum%i\x1fusrmrk%s\x1fselect2\1f</Attr>\n",
-                               routeName, waypointp->shortname, legNum, waypointp->description);
-       fprintf(ofd, "\t\t\t<LegAttr>attr=grpnam%s\x1f</LegAttr>\n", routeName);
+       fprintf(ofd, "\t\t\t<Attr><![CDATA[attr=grpnam%s\x1ftrnrad50\x1fOBJNAM%s\x1flegnum%i\x1fusrmrk%s\x1fselect2\1f]]></Attr>\n", routeName, waypointp->shortname, legNum, waypointp->description);
+       fprintf(ofd, "\t\t\t<LegAttr><![CDATA[attr=grpnam%s\x1f]]></LegAttr>\n", routeName);
        fprintf(ofd, "\t\t\t<NumberOfVertexs>1</NumberOfVertexs>\n");
        fprintf(ofd, "\t\t\t<Latitude>%lf</Latitude>\n", waypointp->latitude);
        fprintf(ofd, "\t\t\t<Longitude>%lf</Longitude>\n", waypointp->longitude);

diff --git a/gpsbabel/msvc/GPSBabel.vcproj b/gpsbabel/msvc/GPSBabel.vcproj
index 8d9f72aea300cde24da007bee00fa1fd36049351..381f27301dcca06df3f21f14551ea77d35f8650b 100644 (file)
--- a/gpsbabel/msvc/GPSBabel.vcproj
+++ b/gpsbabel/msvc/GPSBabel.vcproj
@@ -186,6 +186,9 @@
                                                BrowseInformation="1"/>
                                </FileConfiguration>
                        </File>
+                       <File
+                               RelativePath="..\coastexp.c">
+                       </File>
                        <File
                                RelativePath="..\copilot.c">
                                <FileConfiguration
@@ -399,6 +402,9 @@
                                                BrowseInformation="1"/>
                                </FileConfiguration>
                        </File>
+                       <File
+                               RelativePath="..\glogbook.c">
+                       </File>
                        <File
                                RelativePath="..\gpilots.c">
                                <FileConfiguration
@@ -504,6 +510,9 @@
                                                BrowseInformation="1"/>
                                </FileConfiguration>
                        </File>
+                       <File
+                               RelativePath="..\hiketech.c">
+                       </File>
                        <File
                                RelativePath="..\holux.c">
                                <FileConfiguration
@@ -1038,6 +1047,9 @@
                                                BrowseInformation="1"/>
                                </FileConfiguration>
                        </File>
+                       <File
+                               RelativePath="..\shape.c">
+                       </File>
                        <File
                                RelativePath="..\smplrout.c">
                                <FileConfiguration
@@ -1080,6 +1092,9 @@
                                                BrowseInformation="1"/>
                                </FileConfiguration>
                        </File>
+                       <File
+                               RelativePath="..\stackfilter.c">
+                       </File>
                        <File
                                RelativePath="..\text.c">
                                <FileConfiguration
@@ -1206,6 +1221,12 @@
                                                BrowseInformation="1"/>
                                </FileConfiguration>
                        </File>
+                       <File
+                               RelativePath="..\uuid.c">
+                       </File>
+                       <File
+                               RelativePath="..\vcf.c">
+                       </File>
                        <File
                                RelativePath="..\vecs.c">
                                <FileConfiguration
@@ -1290,6 +1311,9 @@
                                                BrowseInformation="1"/>
                                </FileConfiguration>
                        </File>
+                       <File
+                               RelativePath="..\xmlgeneric.c">
+                       </File>
                        <Filter
                                Name="Jeeps"
                                Filter="">
@@ -1343,6 +1367,9 @@
                                                        BrowseInformation="1"/>
                                        </FileConfiguration>
                                </File>
+                               <File
+                                       RelativePath="..\jeeps\gpslibusb.c">
+                               </File>
                                <File
                                        RelativePath="..\jeeps\gpsmath.c">
                                        <FileConfiguration
@@ -1518,6 +1545,18 @@
                                                        BrowseInformation="1"/>
                                        </FileConfiguration>
                                </File>
+                               <File
+                                       RelativePath="..\jeeps\gpsusbread.c">
+                               </File>
+                               <File
+                                       RelativePath="..\jeeps\gpsusbsend.c">
+                               </File>
+                               <File
+                                       RelativePath="..\jeeps\gpsusbstub.c">
+                               </File>
+                               <File
+                                       RelativePath="..\jeeps\gpsusbwin.c">
+                               </File>
                                <File
                                        RelativePath="..\jeeps\gpsutil.c">
                                        <FileConfiguration
@@ -1598,6 +1637,16 @@
                                        </FileConfiguration>
                                </File>
                        </Filter>
+                       <Filter
+                               Name="shapelib"
+                               Filter="">
+                               <File
+                                       RelativePath="..\shapelib\dbfopen.c">
+                               </File>
+                               <File
+                                       RelativePath="..\shapelib\shpopen.c">
+                               </File>
+                       </Filter>
                </Filter>
                <Filter
                        Name="Header Files"

diff --git a/gpsbabel/reference/Glad_5.exp b/gpsbabel/reference/Glad_5.exp
index 458090147496009e8ce44a14fc50721399e49fd2..f2397b966b1c3f5caaf2453f51fcda3cffe19550 100644 (file)
--- a/gpsbabel/reference/Glad_5.exp
+++ b/gpsbabel/reference/Glad_5.exp
@@ -6,531 +6,531 @@
                <LastModified>0</LastModified>
                <Object>
                        <ClassName>waypnt</ClassName>
-                       <Attr>attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMEdward Island\1flegnum0\1fusrmrkEdward Island\1fselect2\1f</Attr>
-                       <LegAttr>attr=grpnamROUTENAME\1f</LegAttr>
+                       <Attr><![CDATA[attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMEdward Island\1flegnum0\1fusrmrkEdward Island\1fselect2\1f]]></Attr>
+                       <LegAttr><![CDATA[attr=grpnamROUTENAME\1f]]></LegAttr>
                        <NumberOfVertexs>1</NumberOfVertexs>
                        <Latitude>-20.226667</Latitude>
                        <Longitude>149.205000</Longitude>
                </Object>
                <Object>
                        <ClassName>waypnt</ClassName>
-                       <Attr>attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMScawfell Island\1flegnum1\1fusrmrkScawfell Island\1fselect2\1f</Attr>
-                       <LegAttr>attr=grpnamROUTENAME\1f</LegAttr>
+                       <Attr><![CDATA[attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMScawfell Island\1flegnum1\1fusrmrkScawfell Island\1fselect2\1f]]></Attr>
+                       <LegAttr><![CDATA[attr=grpnamROUTENAME\1f]]></LegAttr>
                        <NumberOfVertexs>1</NumberOfVertexs>
-                       <Latitude>-20.850001</Latitude>
-                       <Longitude>149.641668</Longitude>
+                       <Latitude>-20.850000</Latitude>
+                       <Longitude>149.641667</Longitude>
                </Object>
                <Object>
                        <ClassName>waypnt</ClassName>
-                       <Attr>attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMMiddle Island\1flegnum2\1fusrmrkMiddle Island\1fselect2\1f</Attr>
-                       <LegAttr>attr=grpnamROUTENAME\1f</LegAttr>
+                       <Attr><![CDATA[attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMMiddle Island\1flegnum2\1fusrmrkMiddle Island\1fselect2\1f]]></Attr>
+                       <LegAttr><![CDATA[attr=grpnamROUTENAME\1f]]></LegAttr>
                        <NumberOfVertexs>1</NumberOfVertexs>
                        <Latitude>-21.680097</Latitude>
                        <Longitude>150.176053</Longitude>
                </Object>
                <Object>
                        <ClassName>waypnt</ClassName>
-                       <Attr>attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMClara Group\1flegnum3\1fusrmrkClara Group\1fselect2\1f</Attr>
-                       <LegAttr>attr=grpnamROUTENAME\1f</LegAttr>
+                       <Attr><![CDATA[attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMClara Group\1flegnum3\1fusrmrkClara Group\1fselect2\1f]]></Attr>
+                       <LegAttr><![CDATA[attr=grpnamROUTENAME\1f]]></LegAttr>
                        <NumberOfVertexs>1</NumberOfVertexs>
                        <Latitude>-22.318424</Latitude>
-                       <Longitude>150.747717</Longitude>
+                       <Longitude>150.747716</Longitude>
                </Object>
                <Object>
                        <ClassName>waypnt</ClassName>
-                       <Attr>attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMCape Capricorn\1flegnum4\1fusrmrkCape Capricorn\1fselect2\1f</Attr>
-                       <LegAttr>attr=grpnamROUTENAME\1f</LegAttr>
+                       <Attr><![CDATA[attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMCape Capricorn\1flegnum4\1fusrmrkCape Capricorn\1fselect2\1f]]></Attr>
+                       <LegAttr><![CDATA[attr=grpnamROUTENAME\1f]]></LegAttr>
                        <NumberOfVertexs>1</NumberOfVertexs>
-                       <Latitude>-23.448418</Latitude>
-                       <Longitude>151.322717</Longitude>
+                       <Latitude>-23.448417</Latitude>
+                       <Longitude>151.322716</Longitude>
                </Object>
                <Object>
                        <ClassName>waypnt</ClassName>
-                       <Attr>attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMGladstone FWB\1flegnum5\1fusrmrkGladstone FWB\1fselect2\1f</Attr>
-                       <LegAttr>attr=grpnamROUTENAME\1f</LegAttr>
+                       <Attr><![CDATA[attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMGladstone FWB\1flegnum5\1fusrmrkGladstone FWB\1fselect2\1f]]></Attr>
+                       <LegAttr><![CDATA[attr=grpnamROUTENAME\1f]]></LegAttr>
                        <NumberOfVertexs>1</NumberOfVertexs>
-                       <Latitude>-23.890915</Latitude>
-                       <Longitude>151.516051</Longitude>
+                       <Latitude>-23.890914</Latitude>
+                       <Longitude>151.516050</Longitude>
                </Object>
                <Object>
                        <ClassName>waypnt</ClassName>
-                       <Attr>attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMHigh Peak\1flegnum6\1fusrmrkHigh Peak\1fselect2\1f</Attr>
-                       <LegAttr>attr=grpnamROUTENAME\1f</LegAttr>
+                       <Attr><![CDATA[attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMHigh Peak\1flegnum6\1fusrmrkHigh Peak\1fselect2\1f]]></Attr>
+                       <LegAttr><![CDATA[attr=grpnamROUTENAME\1f]]></LegAttr>
                        <NumberOfVertexs>1</NumberOfVertexs>
-                       <Latitude>-21.951660</Latitude>
-                       <Longitude>150.754997</Longitude>
+                       <Latitude>-21.951659</Latitude>
+                       <Longitude>150.754996</Longitude>
                </Object>
                <Object>
                        <ClassName>waypnt</ClassName>
-                       <Attr>attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMPenrith Island\1flegnum7\1fusrmrkPenrith Island\1fselect2\1f</Attr>
-                       <LegAttr>attr=grpnamROUTENAME\1f</LegAttr>
+                       <Attr><![CDATA[attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMPenrith Island\1flegnum7\1fusrmrkPenrith Island\1fselect2\1f]]></Attr>
+                       <LegAttr><![CDATA[attr=grpnamROUTENAME\1f]]></LegAttr>
                        <NumberOfVertexs>1</NumberOfVertexs>
-                       <Latitude>-20.988435</Latitude>
-                       <Longitude>149.929386</Longitude>
+                       <Latitude>-20.988434</Latitude>
+                       <Longitude>149.929385</Longitude>
                </Object>
                <Object>
                        <ClassName>waypnt</ClassName>
-                       <Attr>attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMPinnacle Point\1flegnum8\1fusrmrkPinnacle Point\1fselect2\1f</Attr>
-                       <LegAttr>attr=grpnamROUTENAME\1f</LegAttr>
+                       <Attr><![CDATA[attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMPinnacle Point\1flegnum8\1fusrmrkPinnacle Point\1fselect2\1f]]></Attr>
+                       <LegAttr><![CDATA[attr=grpnamROUTENAME\1f]]></LegAttr>
                        <NumberOfVertexs>1</NumberOfVertexs>
-                       <Latitude>-20.081094</Latitude>
-                       <Longitude>149.064391</Longitude>
+                       <Latitude>-20.081093</Latitude>
+                       <Longitude>149.064390</Longitude>
                </Object>
                <Object>
                        <ClassName>waypnt</ClassName>
-                       <Attr>attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMTink Shoal\1flegnum9\1fusrmrkTink Shoal\1fselect2\1f</Attr>
-                       <LegAttr>attr=grpnamROUTENAME\1f</LegAttr>
+                       <Attr><![CDATA[attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMTink Shoal\1flegnum9\1fusrmrkTink Shoal\1fselect2\1f]]></Attr>
+                       <LegAttr><![CDATA[attr=grpnamROUTENAME\1f]]></LegAttr>
                        <NumberOfVertexs>1</NumberOfVertexs>
                        <Latitude>-19.375083</Latitude>
-                       <Longitude>147.819368</Longitude>
+                       <Longitude>147.819367</Longitude>
                </Object>
                <Object>
                        <ClassName>waypnt</ClassName>
-                       <Attr>attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMPelorus\1flegnum10\1fusrmrkPelorus\1fselect2\1f</Attr>
-                       <LegAttr>attr=grpnamROUTENAME\1f</LegAttr>
+                       <Attr><![CDATA[attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMPelorus\1flegnum10\1fusrmrkPelorus\1fselect2\1f]]></Attr>
+                       <LegAttr><![CDATA[attr=grpnamROUTENAME\1f]]></LegAttr>
                        <NumberOfVertexs>1</NumberOfVertexs>
                        <Latitude>-18.433464</Latitude>
-                       <Longitude>146.549414</Longitude>
+                       <Longitude>146.549413</Longitude>
                </Object>
                <Object>
                        <ClassName>waypnt</ClassName>
-                       <Attr>attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMEva Island\1flegnum11\1fusrmrkEva Island\1fselect2\1f</Attr>
-                       <LegAttr>attr=grpnamROUTENAME\1f</LegAttr>
+                       <Attr><![CDATA[attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMEva Island\1flegnum11\1fusrmrkEva Island\1fselect2\1f]]></Attr>
+                       <LegAttr><![CDATA[attr=grpnamROUTENAME\1f]]></LegAttr>
                        <NumberOfVertexs>1</NumberOfVertexs>
                        <Latitude>-18.213466</Latitude>
-                       <Longitude>146.409415</Longitude>
+                       <Longitude>146.409414</Longitude>
                </Object>
                <Object>
                        <ClassName>waypnt</ClassName>
-                       <Attr>attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMLittle Fitzroy Island\1flegnum12\1fusrmrkLittle Fitzroy Island\1fselect2\1f</Attr>
-                       <LegAttr>attr=grpnamROUTENAME\1f</LegAttr>
+                       <Attr><![CDATA[attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMLittle Fitzroy Island\1flegnum12\1fusrmrkLittle Fitzroy Island\1fselect2\1f]]></Attr>
+                       <LegAttr><![CDATA[attr=grpnamROUTENAME\1f]]></LegAttr>
                        <NumberOfVertexs>1</NumberOfVertexs>
                        <Latitude>-16.913473</Latitude>
-                       <Longitude>146.059411</Longitude>
+                       <Longitude>146.059410</Longitude>
                </Object>
                <Object>
                        <ClassName>waypnt</ClassName>
-                       <Attr>attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMCairns FWB\1flegnum13\1fusrmrkCairns FWB\1fselect2\1f</Attr>
-                       <LegAttr>attr=grpnamROUTENAME\1f</LegAttr>
+                       <Attr><![CDATA[attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMCairns FWB\1flegnum13\1fusrmrkCairns FWB\1fselect2\1f]]></Attr>
+                       <LegAttr><![CDATA[attr=grpnamROUTENAME\1f]]></LegAttr>
                        <NumberOfVertexs>1</NumberOfVertexs>
-                       <Latitude>-16.731976</Latitude>
+                       <Latitude>-16.731975</Latitude>
                        <Longitude>145.889412</Longitude>
                </Object>
                <Object>
                        <ClassName>waypnt</ClassName>
-                       <Attr>attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMLow Isles\1flegnum14\1fusrmrkLow Isles\1fselect2\1f</Attr>
-                       <LegAttr>attr=grpnamROUTENAME\1f</LegAttr>
+                       <Attr><![CDATA[attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMLow Isles\1flegnum14\1fusrmrkLow Isles\1fselect2\1f]]></Attr>
+                       <LegAttr><![CDATA[attr=grpnamROUTENAME\1f]]></LegAttr>
                        <NumberOfVertexs>1</NumberOfVertexs>
-                       <Latitude>-16.465145</Latitude>
+                       <Latitude>-16.465144</Latitude>
                        <Longitude>145.637746</Longitude>
                </Object>
                <Object>
                        <ClassName>waypnt</ClassName>
-                       <Attr>attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMPickersgill Reef\1flegnum15\1fusrmrkPickersgill Reef\1fselect2\1f</Attr>
-                       <LegAttr>attr=grpnamROUTENAME\1f</LegAttr>
+                       <Attr><![CDATA[attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMPickersgill Reef\1flegnum15\1fusrmrkPickersgill Reef\1fselect2\1f]]></Attr>
+                       <LegAttr><![CDATA[attr=grpnamROUTENAME\1f]]></LegAttr>
                        <NumberOfVertexs>1</NumberOfVertexs>
-                       <Latitude>-15.921815</Latitude>
+                       <Latitude>-15.921814</Latitude>
                        <Longitude>145.481079</Longitude>
                </Object>
                <Object>
                        <ClassName>waypnt</ClassName>
-                       <Attr>attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMGubbins\1flegnum16\1fusrmrkGubbins\1fselect2\1f</Attr>
-                       <LegAttr>attr=grpnamROUTENAME\1f</LegAttr>
+                       <Attr><![CDATA[attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMGubbins\1flegnum16\1fusrmrkGubbins\1fselect2\1f]]></Attr>
+                       <LegAttr><![CDATA[attr=grpnamROUTENAME\1f]]></LegAttr>
                        <NumberOfVertexs>1</NumberOfVertexs>
-                       <Latitude>-15.708467</Latitude>
-                       <Longitude>145.382747</Longitude>
+                       <Latitude>-15.708466</Latitude>
+                       <Longitude>145.382746</Longitude>
                </Object>
                <Object>
                        <ClassName>waypnt</ClassName>
-                       <Attr>attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMThree Isles\1flegnum17\1fusrmrkThree Isles\1fselect2\1f</Attr>
-                       <LegAttr>attr=grpnamROUTENAME\1f</LegAttr>
+                       <Attr><![CDATA[attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMThree Isles\1flegnum17\1fusrmrkThree Isles\1fselect2\1f]]></Attr>
+                       <LegAttr><![CDATA[attr=grpnamROUTENAME\1f]]></LegAttr>
                        <NumberOfVertexs>1</NumberOfVertexs>
-                       <Latitude>-15.110153</Latitude>
+                       <Latitude>-15.110152</Latitude>
                        <Longitude>145.402742</Longitude>
                </Object>
                <Object>
                        <ClassName>waypnt</ClassName>
-                       <Attr>attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMPalfrey\1flegnum18\1fusrmrkPalfrey\1fselect2\1f</Attr>
-                       <LegAttr>attr=grpnamROUTENAME\1f</LegAttr>
+                       <Attr><![CDATA[attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMPalfrey\1flegnum18\1fusrmrkPalfrey\1fselect2\1f]]></Attr>
+                       <LegAttr><![CDATA[attr=grpnamROUTENAME\1f]]></LegAttr>
                        <NumberOfVertexs>1</NumberOfVertexs>
                        <Latitude>-14.673488</Latitude>
-                       <Longitude>145.417741</Longitude>
+                       <Longitude>145.417740</Longitude>
                </Object>
                <Object>
                        <ClassName>waypnt</ClassName>
-                       <Attr>attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMNymph Island\1flegnum19\1fusrmrkNymph Island\1fselect2\1f</Attr>
-                       <LegAttr>attr=grpnamROUTENAME\1f</LegAttr>
+                       <Attr><![CDATA[attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMNymph Island\1flegnum19\1fusrmrkNymph Island\1fselect2\1f]]></Attr>
+                       <LegAttr><![CDATA[attr=grpnamROUTENAME\1f]]></LegAttr>
                        <NumberOfVertexs>1</NumberOfVertexs>
                        <Latitude>-14.626822</Latitude>
-                       <Longitude>145.251076</Longitude>
+                       <Longitude>145.251075</Longitude>
                </Object>
                <Object>
                        <ClassName>waypnt</ClassName>
-                       <Attr>attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMCoquet\1flegnum20\1fusrmrkCoquet\1fselect2\1f</Attr>
-                       <LegAttr>attr=grpnamROUTENAME\1f</LegAttr>
+                       <Attr><![CDATA[attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMCoquet\1flegnum20\1fusrmrkCoquet\1fselect2\1f]]></Attr>
+                       <LegAttr><![CDATA[attr=grpnamROUTENAME\1f]]></LegAttr>
                        <NumberOfVertexs>1</NumberOfVertexs>
-                       <Latitude>-14.546824</Latitude>
-                       <Longitude>145.061078</Longitude>
+                       <Latitude>-14.546823</Latitude>
+                       <Longitude>145.061077</Longitude>
                </Object>
                <Object>
                        <ClassName>waypnt</ClassName>
-                       <Attr>attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMHowick\1flegnum21\1fusrmrkHowick\1fselect2\1f</Attr>
-                       <LegAttr>attr=grpnamROUTENAME\1f</LegAttr>
+                       <Attr><![CDATA[attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMHowick\1flegnum21\1fusrmrkHowick\1fselect2\1f]]></Attr>
+                       <LegAttr><![CDATA[attr=grpnamROUTENAME\1f]]></LegAttr>
                        <NumberOfVertexs>1</NumberOfVertexs>
-                       <Latitude>-14.483492</Latitude>
-                       <Longitude>144.979412</Longitude>
+                       <Latitude>-14.483491</Latitude>
+                       <Longitude>144.979411</Longitude>
                </Object>
                <Object>
                        <ClassName>waypnt</ClassName>
-                       <Attr>attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMMegaera\1flegnum22\1fusrmrkMegaera\1fselect2\1f</Attr>
-                       <LegAttr>attr=grpnamROUTENAME\1f</LegAttr>
+                       <Attr><![CDATA[attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMMegaera\1flegnum22\1fusrmrkMegaera\1fselect2\1f]]></Attr>
+                       <LegAttr><![CDATA[attr=grpnamROUTENAME\1f]]></LegAttr>
                        <NumberOfVertexs>1</NumberOfVertexs>
-                       <Latitude>-14.483492</Latitude>
-                       <Longitude>144.932746</Longitude>
+                       <Latitude>-14.483491</Latitude>
+                       <Longitude>144.932745</Longitude>
                </Object>
                <Object>
                        <ClassName>waypnt</ClassName>
-                       <Attr>attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMWatson\1flegnum23\1fusrmrkWatson\1fselect2\1f</Attr>
-                       <LegAttr>attr=grpnamROUTENAME\1f</LegAttr>
+                       <Attr><![CDATA[attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMWatson\1flegnum23\1fusrmrkWatson\1fselect2\1f]]></Attr>
+                       <LegAttr><![CDATA[attr=grpnamROUTENAME\1f]]></LegAttr>
                        <NumberOfVertexs>1</NumberOfVertexs>
-                       <Latitude>-14.451826</Latitude>
-                       <Longitude>144.902746</Longitude>
+                       <Latitude>-14.451825</Latitude>
+                       <Longitude>144.902745</Longitude>
                </Object>
                <Object>
                        <ClassName>waypnt</ClassName>
-                       <Attr>attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMBarrow\1flegnum24\1fusrmrkBarrow\1fselect2\1f</Attr>
-                       <LegAttr>attr=grpnamROUTENAME\1f</LegAttr>
+                       <Attr><![CDATA[attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMBarrow\1flegnum24\1fusrmrkBarrow\1fselect2\1f]]></Attr>
+                       <LegAttr><![CDATA[attr=grpnamROUTENAME\1f]]></LegAttr>
                        <NumberOfVertexs>1</NumberOfVertexs>
                        <Latitude>-14.361826</Latitude>
-                       <Longitude>144.686082</Longitude>
+                       <Longitude>144.686081</Longitude>
                </Object>
                <Object>
                        <ClassName>waypnt</ClassName>
-                       <Attr>attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMRocky Point\1flegnum25\1fusrmrkRocky Point\1fselect2\1f</Attr>
-                       <LegAttr>attr=grpnamROUTENAME\1f</LegAttr>
+                       <Attr><![CDATA[attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMRocky Point\1flegnum25\1fusrmrkRocky Point\1fselect2\1f]]></Attr>
+                       <LegAttr><![CDATA[attr=grpnamROUTENAME\1f]]></LegAttr>
                        <NumberOfVertexs>1</NumberOfVertexs>
                        <Latitude>-14.195161</Latitude>
                        <Longitude>144.604414</Longitude>
                </Object>
                <Object>
                        <ClassName>waypnt</ClassName>
-                       <Attr>attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMPipon\1flegnum26\1fusrmrkPipon\1fselect2\1f</Attr>
-                       <LegAttr>attr=grpnamROUTENAME\1f</LegAttr>
+                       <Attr><![CDATA[attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMPipon\1flegnum26\1fusrmrkPipon\1fselect2\1f]]></Attr>
+                       <LegAttr><![CDATA[attr=grpnamROUTENAME\1f]]></LegAttr>
                        <NumberOfVertexs>1</NumberOfVertexs>
                        <Latitude>-14.138495</Latitude>
                        <Longitude>144.511082</Longitude>
                </Object>
                <Object>
                        <ClassName>waypnt</ClassName>
-                       <Attr>attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMKing Island\1flegnum27\1fusrmrkKing Island\1fselect2\1f</Attr>
-                       <LegAttr>attr=grpnamROUTENAME\1f</LegAttr>
+                       <Attr><![CDATA[attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMKing Island\1flegnum27\1fusrmrkKing Island\1fselect2\1f]]></Attr>
+                       <LegAttr><![CDATA[attr=grpnamROUTENAME\1f]]></LegAttr>
                        <NumberOfVertexs>1</NumberOfVertexs>
-                       <Latitude>-14.060164</Latitude>
-                       <Longitude>144.331084</Longitude>
+                       <Latitude>-14.060163</Latitude>
+                       <Longitude>144.331083</Longitude>
                </Object>
                <Object>
                        <ClassName>waypnt</ClassName>
-                       <Attr>attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMClack Island\1flegnum28\1fusrmrkClack Island\1fselect2\1f</Attr>
-                       <LegAttr>attr=grpnamROUTENAME\1f</LegAttr>
+                       <Attr><![CDATA[attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMClack Island\1flegnum28\1fusrmrkClack Island\1fselect2\1f]]></Attr>
+                       <LegAttr><![CDATA[attr=grpnamROUTENAME\1f]]></LegAttr>
                        <NumberOfVertexs>1</NumberOfVertexs>
                        <Latitude>-14.101829</Latitude>
                        <Longitude>144.244418</Longitude>
                </Object>
                <Object>
                        <ClassName>waypnt</ClassName>
-                       <Attr>attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMWharton Reef\1flegnum29\1fusrmrkWharton Reef\1fselect2\1f</Attr>
-                       <LegAttr>attr=grpnamROUTENAME\1f</LegAttr>
+                       <Attr><![CDATA[attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMWharton Reef\1flegnum29\1fusrmrkWharton Reef\1fselect2\1f]]></Attr>
+                       <LegAttr><![CDATA[attr=grpnamROUTENAME\1f]]></LegAttr>
                        <NumberOfVertexs>1</NumberOfVertexs>
                        <Latitude>-14.101831</Latitude>
-                       <Longitude>143.977755</Longitude>
+                       <Longitude>143.977754</Longitude>
                </Object>
                <Object>
                        <ClassName>waypnt</ClassName>
-                       <Attr>attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMEden\1flegnum30\1fusrmrkEden\1fselect2\1f</Attr>
-                       <LegAttr>attr=grpnamROUTENAME\1f</LegAttr>
+                       <Attr><![CDATA[attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMEden\1flegnum30\1fusrmrkEden\1fselect2\1f]]></Attr>
+                       <LegAttr><![CDATA[attr=grpnamROUTENAME\1f]]></LegAttr>
                        <NumberOfVertexs>1</NumberOfVertexs>
-                       <Latitude>-14.065165</Latitude>
-                       <Longitude>143.917756</Longitude>
+                       <Latitude>-14.065164</Latitude>
+                       <Longitude>143.917755</Longitude>
                </Object>
                <Object>
                        <ClassName>waypnt</ClassName>
-                       <Attr>attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMStainer Reef\1flegnum31\1fusrmrkStainer Reef\1fselect2\1f</Attr>
-                       <LegAttr>attr=grpnamROUTENAME\1f</LegAttr>
+                       <Attr><![CDATA[attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMStainer Reef\1flegnum31\1fusrmrkStainer Reef\1fselect2\1f]]></Attr>
+                       <LegAttr><![CDATA[attr=grpnamROUTENAME\1f]]></LegAttr>
                        <NumberOfVertexs>1</NumberOfVertexs>
                        <Latitude>-13.981832</Latitude>
                        <Longitude>143.834422</Longitude>
                </Object>
                <Object>
                        <ClassName>waypnt</ClassName>
-                       <Attr>attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMPelican\1flegnum32\1fusrmrkPelican\1fselect2\1f</Attr>
-                       <LegAttr>attr=grpnamROUTENAME\1f</LegAttr>
+                       <Attr><![CDATA[attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMPelican\1flegnum32\1fusrmrkPelican\1fselect2\1f]]></Attr>
+                       <LegAttr><![CDATA[attr=grpnamROUTENAME\1f]]></LegAttr>
                        <NumberOfVertexs>1</NumberOfVertexs>
-                       <Latitude>-13.915167</Latitude>
-                       <Longitude>143.812756</Longitude>
+                       <Latitude>-13.915166</Latitude>
+                       <Longitude>143.812755</Longitude>
                </Object>
                <Object>
                        <ClassName>waypnt</ClassName>
-                       <Attr>attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMMagpie\1flegnum33\1fusrmrkMagpie\1fselect2\1f</Attr>
-                       <LegAttr>attr=grpnamROUTENAME\1f</LegAttr>
+                       <Attr><![CDATA[attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMMagpie\1flegnum33\1fusrmrkMagpie\1fselect2\1f]]></Attr>
+                       <LegAttr><![CDATA[attr=grpnamROUTENAME\1f]]></LegAttr>
                        <NumberOfVertexs>1</NumberOfVertexs>
                        <Latitude>-13.815167</Latitude>
                        <Longitude>143.734423</Longitude>
                </Object>
                <Object>
                        <ClassName>waypnt</ClassName>
-                       <Attr>attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMFife\1flegnum34\1fusrmrkFife\1fselect2\1f</Attr>
-                       <LegAttr>attr=grpnamROUTENAME\1f</LegAttr>
+                       <Attr><![CDATA[attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMFife\1flegnum34\1fusrmrkFife\1fselect2\1f]]></Attr>
+                       <LegAttr><![CDATA[attr=grpnamROUTENAME\1f]]></LegAttr>
                        <NumberOfVertexs>1</NumberOfVertexs>
-                       <Latitude>-13.656835</Latitude>
+                       <Latitude>-13.656834</Latitude>
                        <Longitude>143.704422</Longitude>
                </Object>
                <Object>
                        <ClassName>waypnt</ClassName>
-                       <Attr>attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMHeath Reef\1flegnum35\1fusrmrkHeath Reef\1fselect2\1f</Attr>
-                       <LegAttr>attr=grpnamROUTENAME\1f</LegAttr>
+                       <Attr><![CDATA[attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMHeath Reef\1flegnum35\1fusrmrkHeath Reef\1fselect2\1f]]></Attr>
+                       <LegAttr><![CDATA[attr=grpnamROUTENAME\1f]]></LegAttr>
                        <NumberOfVertexs>1</NumberOfVertexs>
-                       <Latitude>-13.475170</Latitude>
-                       <Longitude>143.671089</Longitude>
+                       <Latitude>-13.475169</Latitude>
+                       <Longitude>143.671088</Longitude>
                </Object>
                <Object>
                        <ClassName>waypnt</ClassName>
-                       <Attr>attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMBow Reef\1flegnum36\1fusrmrkBow Reef\1fselect2\1f</Attr>
-                       <LegAttr>attr=grpnamROUTENAME\1f</LegAttr>
+                       <Attr><![CDATA[attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMBow Reef\1flegnum36\1fusrmrkBow Reef\1fselect2\1f]]></Attr>
+                       <LegAttr><![CDATA[attr=grpnamROUTENAME\1f]]></LegAttr>
                        <NumberOfVertexs>1</NumberOfVertexs>
                        <Latitude>-13.341836</Latitude>
-                       <Longitude>143.671089</Longitude>
+                       <Longitude>143.671088</Longitude>
                </Object>
                <Object>
                        <ClassName>waypnt</ClassName>
-                       <Attr>attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMOsborne\1flegnum37\1fusrmrkOsborne\1fselect2\1f</Attr>
-                       <LegAttr>attr=grpnamROUTENAME\1f</LegAttr>
+                       <Attr><![CDATA[attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMOsborne\1flegnum37\1fusrmrkOsborne\1fselect2\1f]]></Attr>
+                       <LegAttr><![CDATA[attr=grpnamROUTENAME\1f]]></LegAttr>
                        <NumberOfVertexs>1</NumberOfVertexs>
                        <Latitude>-13.096838</Latitude>
                        <Longitude>143.611087</Longitude>
                </Object>
                <Object>
                        <ClassName>waypnt</ClassName>
-                       <Attr>attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMChapman\1flegnum38\1fusrmrkChapman\1fselect2\1f</Attr>
-                       <LegAttr>attr=grpnamROUTENAME\1f</LegAttr>
+                       <Attr><![CDATA[attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMChapman\1flegnum38\1fusrmrkChapman\1fselect2\1f]]></Attr>
+                       <LegAttr><![CDATA[attr=grpnamROUTENAME\1f]]></LegAttr>
                        <NumberOfVertexs>1</NumberOfVertexs>
                        <Latitude>-12.886839</Latitude>
                        <Longitude>143.594420</Longitude>
                </Object>
                <Object>
                        <ClassName>waypnt</ClassName>
-                       <Attr>attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMWye Reef\1flegnum39\1fusrmrkWye Reef\1fselect2\1f</Attr>
-                       <LegAttr>attr=grpnamROUTENAME\1f</LegAttr>
+                       <Attr><![CDATA[attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMWye Reef\1flegnum39\1fusrmrkWye Reef\1fselect2\1f]]></Attr>
+                       <LegAttr><![CDATA[attr=grpnamROUTENAME\1f]]></LegAttr>
                        <NumberOfVertexs>1</NumberOfVertexs>
                        <Latitude>-12.818506</Latitude>
                        <Longitude>143.586087</Longitude>
                </Object>
                <Object>
                        <ClassName>waypnt</ClassName>
-                       <Attr>attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMEel Reef\1flegnum40\1fusrmrkEel Reef\1fselect2\1f</Attr>
-                       <LegAttr>attr=grpnamROUTENAME\1f</LegAttr>
+                       <Attr><![CDATA[attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMEel Reef\1flegnum40\1fusrmrkEel Reef\1fselect2\1f]]></Attr>
+                       <LegAttr><![CDATA[attr=grpnamROUTENAME\1f]]></LegAttr>
                        <NumberOfVertexs>1</NumberOfVertexs>
                        <Latitude>-12.415159</Latitude>
                        <Longitude>143.362754</Longitude>
                </Object>
                <Object>
                        <ClassName>waypnt</ClassName>
-                       <Attr>attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMPiper\1flegnum41\1fusrmrkPiper\1fselect2\1f</Attr>
-                       <LegAttr>attr=grpnamROUTENAME\1f</LegAttr>
+                       <Attr><![CDATA[attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMPiper\1flegnum41\1fusrmrkPiper\1fselect2\1f]]></Attr>
+                       <LegAttr><![CDATA[attr=grpnamROUTENAME\1f]]></LegAttr>
                        <NumberOfVertexs>1</NumberOfVertexs>
                        <Latitude>-12.236844</Latitude>
                        <Longitude>143.247755</Longitude>
                </Object>
                <Object>
                        <ClassName>waypnt</ClassName>
-                       <Attr>attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMMoody\1flegnum42\1fusrmrkMoody\1fselect2\1f</Attr>
-                       <LegAttr>attr=grpnamROUTENAME\1f</LegAttr>
+                       <Attr><![CDATA[attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMMoody\1flegnum42\1fusrmrkMoody\1fselect2\1f]]></Attr>
+                       <LegAttr><![CDATA[attr=grpnamROUTENAME\1f]]></LegAttr>
                        <NumberOfVertexs>1</NumberOfVertexs>
                        <Latitude>-12.085178</Latitude>
                        <Longitude>143.239421</Longitude>
                </Object>
                <Object>
                        <ClassName>waypnt</ClassName>
-                       <Attr>attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMClerke\1flegnum43\1fusrmrkClerke\1fselect2\1f</Attr>
-                       <LegAttr>attr=grpnamROUTENAME\1f</LegAttr>
+                       <Attr><![CDATA[attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMClerke\1flegnum43\1fusrmrkClerke\1fselect2\1f]]></Attr>
+                       <LegAttr><![CDATA[attr=grpnamROUTENAME\1f]]></LegAttr>
                        <NumberOfVertexs>1</NumberOfVertexs>
-                       <Latitude>-11.963513</Latitude>
-                       <Longitude>143.317754</Longitude>
+                       <Latitude>-11.963512</Latitude>
+                       <Longitude>143.317753</Longitude>
                </Object>
                <Object>
                        <ClassName>waypnt</ClassName>
-                       <Attr>attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMHannibal\1flegnum44\1fusrmrkHannibal\1fselect2\1f</Attr>
-                       <LegAttr>attr=grpnamROUTENAME\1f</LegAttr>
+                       <Attr><![CDATA[attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMHannibal\1flegnum44\1fusrmrkHannibal\1fselect2\1f]]></Attr>
+                       <LegAttr><![CDATA[attr=grpnamROUTENAME\1f]]></LegAttr>
                        <NumberOfVertexs>1</NumberOfVertexs>
-                       <Latitude>-11.586850</Latitude>
-                       <Longitude>142.981089</Longitude>
+                       <Latitude>-11.586849</Latitude>
+                       <Longitude>142.981088</Longitude>
                </Object>
                <Object>
                        <ClassName>waypnt</ClassName>
-                       <Attr>attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMHalfway\1flegnum45\1fusrmrkHalfway\1fselect2\1f</Attr>
-                       <LegAttr>attr=grpnamROUTENAME\1f</LegAttr>
+                       <Attr><![CDATA[attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMHalfway\1flegnum45\1fusrmrkHalfway\1fselect2\1f]]></Attr>
+                       <LegAttr><![CDATA[attr=grpnamROUTENAME\1f]]></LegAttr>
                        <NumberOfVertexs>1</NumberOfVertexs>
                        <Latitude>-11.378517</Latitude>
                        <Longitude>142.986088</Longitude>
                </Object>
                <Object>
                        <ClassName>waypnt</ClassName>
-                       <Attr>attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMCairncross\1flegnum46\1fusrmrkCairncross\1fselect2\1f</Attr>
-                       <LegAttr>attr=grpnamROUTENAME\1f</LegAttr>
+                       <Attr><![CDATA[attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMCairncross\1flegnum46\1fusrmrkCairncross\1fselect2\1f]]></Attr>
+                       <LegAttr><![CDATA[attr=grpnamROUTENAME\1f]]></LegAttr>
                        <NumberOfVertexs>1</NumberOfVertexs>
                        <Latitude>-11.231851</Latitude>
-                       <Longitude>142.954422</Longitude>
+                       <Longitude>142.954421</Longitude>
                </Object>
                <Object>
                        <ClassName>waypnt</ClassName>
-                       <Attr>attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMWyborn\1flegnum47\1fusrmrkWyborn\1fselect2\1f</Attr>
-                       <LegAttr>attr=grpnamROUTENAME\1f</LegAttr>
+                       <Attr><![CDATA[attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMWyborn\1flegnum47\1fusrmrkWyborn\1fselect2\1f]]></Attr>
+                       <LegAttr><![CDATA[attr=grpnamROUTENAME\1f]]></LegAttr>
                        <NumberOfVertexs>1</NumberOfVertexs>
                        <Latitude>-10.806855</Latitude>
                        <Longitude>142.804421</Longitude>
                </Object>
                <Object>
                        <ClassName>waypnt</ClassName>
-                       <Attr>attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMAlbany Rock\1flegnum48\1fusrmrkAlbany Rock\1fselect2\1f</Attr>
-                       <LegAttr>attr=grpnamROUTENAME\1f</LegAttr>
+                       <Attr><![CDATA[attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMAlbany Rock\1flegnum48\1fusrmrkAlbany Rock\1fselect2\1f]]></Attr>
+                       <LegAttr><![CDATA[attr=grpnamROUTENAME\1f]]></LegAttr>
                        <NumberOfVertexs>1</NumberOfVertexs>
-                       <Latitude>-10.741856</Latitude>
+                       <Latitude>-10.741855</Latitude>
                        <Longitude>142.676089</Longitude>
                </Object>
                <Object>
                        <ClassName>waypnt</ClassName>
-                       <Attr>attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMAlpha Rock\1flegnum49\1fusrmrkAlpha Rock\1fselect2\1f</Attr>
-                       <LegAttr>attr=grpnamROUTENAME\1f</LegAttr>
+                       <Attr><![CDATA[attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMAlpha Rock\1flegnum49\1fusrmrkAlpha Rock\1fselect2\1f]]></Attr>
+                       <LegAttr><![CDATA[attr=grpnamROUTENAME\1f]]></LegAttr>
                        <NumberOfVertexs>1</NumberOfVertexs>
                        <Latitude>-10.601857</Latitude>
                        <Longitude>142.552756</Longitude>
                </Object>
                <Object>
                        <ClassName>waypnt</ClassName>
-                       <Attr>attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMHerald Patches\1flegnum50\1fusrmrkHerald Patches\1fselect2\1f</Attr>
-                       <LegAttr>attr=grpnamROUTENAME\1f</LegAttr>
+                       <Attr><![CDATA[attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMHerald Patches\1flegnum50\1fusrmrkHerald Patches\1fselect2\1f]]></Attr>
+                       <LegAttr><![CDATA[attr=grpnamROUTENAME\1f]]></LegAttr>
                        <NumberOfVertexs>1</NumberOfVertexs>
-                       <Latitude>-10.501859</Latitude>
-                       <Longitude>142.377759</Longitude>
+                       <Latitude>-10.501858</Latitude>
+                       <Longitude>142.377758</Longitude>
                </Object>
                <Object>
                        <ClassName>waypnt</ClassName>
-                       <Attr>attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMEast Strait Leads\1flegnum51\1fusrmrkEast Strait Leads\1fselect2\1f</Attr>
-                       <LegAttr>attr=grpnamROUTENAME\1f</LegAttr>
+                       <Attr><![CDATA[attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMEast Strait Leads\1flegnum51\1fusrmrkEast Strait Leads\1fselect2\1f]]></Attr>
+                       <LegAttr><![CDATA[attr=grpnamROUTENAME\1f]]></LegAttr>
                        <NumberOfVertexs>1</NumberOfVertexs>
                        <Latitude>-10.480192</Latitude>
-                       <Longitude>142.334426</Longitude>
+                       <Longitude>142.334425</Longitude>
                </Object>
                <Object>
                        <ClassName>waypnt</ClassName>
-                       <Attr>attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMShadwell Point\1flegnum52\1fusrmrkShadwell Point\1fselect2\1f</Attr>
-                       <LegAttr>attr=grpnamROUTENAME\1f</LegAttr>
+                       <Attr><![CDATA[attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMShadwell Point\1flegnum52\1fusrmrkShadwell Point\1fselect2\1f]]></Attr>
+                       <LegAttr><![CDATA[attr=grpnamROUTENAME\1f]]></LegAttr>
                        <NumberOfVertexs>1</NumberOfVertexs>
-                       <Latitude>-10.495193</Latitude>
-                       <Longitude>142.282760</Longitude>
+                       <Latitude>-10.495192</Latitude>
+                       <Longitude>142.282759</Longitude>
                </Object>
                <Object>
                        <ClassName>waypnt</ClassName>
-                       <Attr>attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMNardana\1flegnum53\1fusrmrkNardana\1fselect2\1f</Attr>
-                       <LegAttr>attr=grpnamROUTENAME\1f</LegAttr>
+                       <Attr><![CDATA[attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMNardana\1flegnum53\1fusrmrkNardana\1fselect2\1f]]></Attr>
+                       <LegAttr><![CDATA[attr=grpnamROUTENAME\1f]]></LegAttr>
                        <NumberOfVertexs>1</NumberOfVertexs>
                        <Latitude>-10.508525</Latitude>
-                       <Longitude>142.251094</Longitude>
+                       <Longitude>142.251093</Longitude>
                </Object>
                <Object>
                        <ClassName>waypnt</ClassName>
-                       <Attr>attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMHammond\1flegnum54\1fusrmrkHammond\1fselect2\1f</Attr>
-                       <LegAttr>attr=grpnamROUTENAME\1f</LegAttr>
+                       <Attr><![CDATA[attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMHammond\1flegnum54\1fusrmrkHammond\1fselect2\1f]]></Attr>
+                       <LegAttr><![CDATA[attr=grpnamROUTENAME\1f]]></LegAttr>
                        <NumberOfVertexs>1</NumberOfVertexs>
-                       <Latitude>-10.510193</Latitude>
-                       <Longitude>142.202761</Longitude>
+                       <Latitude>-10.510192</Latitude>
+                       <Longitude>142.202760</Longitude>
                </Object>
                <Object>
                        <ClassName>waypnt</ClassName>
-                       <Attr>attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMHarrison\1flegnum55\1fusrmrkHarrison\1fselect2\1f</Attr>
-                       <LegAttr>attr=grpnamROUTENAME\1f</LegAttr>
+                       <Attr><![CDATA[attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMHarrison\1flegnum55\1fusrmrkHarrison\1fselect2\1f]]></Attr>
+                       <LegAttr><![CDATA[attr=grpnamROUTENAME\1f]]></LegAttr>
                        <NumberOfVertexs>1</NumberOfVertexs>
-                       <Latitude>-10.561860</Latitude>
+                       <Latitude>-10.561859</Latitude>
                        <Longitude>142.126094</Longitude>
                </Object>
                <Object>
                        <ClassName>waypnt</ClassName>
-                       <Attr>attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMB1\1flegnum56\1fusrmrkB1\1fselect2\1f</Attr>
-                       <LegAttr>attr=grpnamROUTENAME\1f</LegAttr>
+                       <Attr><![CDATA[attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMB1\1flegnum56\1fusrmrkB1\1fselect2\1f]]></Attr>
+                       <LegAttr><![CDATA[attr=grpnamROUTENAME\1f]]></LegAttr>
                        <NumberOfVertexs>1</NumberOfVertexs>
-                       <Latitude>-10.568518</Latitude>
-                       <Longitude>141.909434</Longitude>
+                       <Latitude>-10.568517</Latitude>
+                       <Longitude>141.909433</Longitude>
                </Object>
                <Object>
                        <ClassName>waypnt</ClassName>
-                       <Attr>attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMRed Banks\1flegnum57\1fusrmrkRed Banks\1fselect2\1f</Attr>
-                       <LegAttr>attr=grpnamROUTENAME\1f</LegAttr>
+                       <Attr><![CDATA[attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMRed Banks\1flegnum57\1fusrmrkRed Banks\1fselect2\1f]]></Attr>
+                       <LegAttr><![CDATA[attr=grpnamROUTENAME\1f]]></LegAttr>
                        <NumberOfVertexs>1</NumberOfVertexs>
-                       <Latitude>-10.829183</Latitude>
-                       <Longitude>141.659174</Longitude>
+                       <Latitude>-10.829182</Latitude>
+                       <Longitude>141.659173</Longitude>
                </Object>
                <Object>
                        <ClassName>waypnt</ClassName>
-                       <Attr>attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMDuyfken Pt\1flegnum58\1fusrmrkDuyfken Pt\1fselect2\1f</Attr>
-                       <LegAttr>attr=grpnamROUTENAME\1f</LegAttr>
+                       <Attr><![CDATA[attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMDuyfken Pt\1flegnum58\1fusrmrkDuyfken Pt\1fselect2\1f]]></Attr>
+                       <LegAttr><![CDATA[attr=grpnamROUTENAME\1f]]></LegAttr>
                        <NumberOfVertexs>1</NumberOfVertexs>
                        <Latitude>-12.568516</Latitude>
                        <Longitude>141.501109</Longitude>
                </Object>
                <Object>
                        <ClassName>waypnt</ClassName>
-                       <Attr>attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMWeipa Leads\1flegnum59\1fusrmrkWeipa Leads\1fselect2\1f</Attr>
-                       <LegAttr>attr=grpnamROUTENAME\1f</LegAttr>
+                       <Attr><![CDATA[attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMWeipa Leads\1flegnum59\1fusrmrkWeipa Leads\1fselect2\1f]]></Attr>
+                       <LegAttr><![CDATA[attr=grpnamROUTENAME\1f]]></LegAttr>
                        <NumberOfVertexs>1</NumberOfVertexs>
                        <Latitude>-12.705000</Latitude>
                        <Longitude>141.661667</Longitude>
                </Object>
                <Object>
                        <ClassName>waypnt</ClassName>
-                       <Attr>attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMWeipa FWB\1flegnum60\1fusrmrkWeipa FWB\1fselect2\1f</Attr>
-                       <LegAttr>attr=grpnamROUTENAME\1f</LegAttr>
+                       <Attr><![CDATA[attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMWeipa FWB\1flegnum60\1fusrmrkWeipa FWB\1fselect2\1f]]></Attr>
+                       <LegAttr><![CDATA[attr=grpnamROUTENAME\1f]]></LegAttr>
                        <NumberOfVertexs>1</NumberOfVertexs>
                        <Latitude>-12.700000</Latitude>
                        <Longitude>141.688333</Longitude>
                </Object>
                <Object>
                        <ClassName>waypnt</ClassName>
-                       <Attr>attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMGannet\1flegnum61\1fusrmrkGannet\1fselect2\1f</Attr>
-                       <LegAttr>attr=grpnamROUTENAME\1f</LegAttr>
+                       <Attr><![CDATA[attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMGannet\1flegnum61\1fusrmrkGannet\1fselect2\1f]]></Attr>
+                       <LegAttr><![CDATA[attr=grpnamROUTENAME\1f]]></LegAttr>
                        <NumberOfVertexs>1</NumberOfVertexs>
                        <Latitude>-10.590757</Latitude>
                        <Longitude>141.875120</Longitude>
                </Object>
                <Object>
                        <ClassName>waypnt</ClassName>
-                       <Attr>attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMB2\1flegnum62\1fusrmrkB2\1fselect2\1f</Attr>
-                       <LegAttr>attr=grpnamROUTENAME\1f</LegAttr>
+                       <Attr><![CDATA[attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMB2\1flegnum62\1fusrmrkB2\1fselect2\1f]]></Attr>
+                       <LegAttr><![CDATA[attr=grpnamROUTENAME\1f]]></LegAttr>
                        <NumberOfVertexs>1</NumberOfVertexs>
                        <Latitude>-10.575158</Latitude>
                        <Longitude>141.891066</Longitude>
                </Object>
                <Object>
                        <ClassName>waypnt</ClassName>
-                       <Attr>attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMMid Decap\1flegnum63\1fusrmrkMid Decap\1fselect2\1f</Attr>
-                       <LegAttr>attr=grpnamROUTENAME\1f</LegAttr>
+                       <Attr><![CDATA[attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMMid Decap\1flegnum63\1fusrmrkMid Decap\1fselect2\1f]]></Attr>
+                       <LegAttr><![CDATA[attr=grpnamROUTENAME\1f]]></LegAttr>
                        <NumberOfVertexs>1</NumberOfVertexs>
                        <Latitude>-14.965864</Latitude>
                        <Longitude>145.407427</Longitude>
                </Object>
                <Object>
                        <ClassName>waypnt</ClassName>
-                       <Attr>attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMTurtle\1flegnum64\1fusrmrkTurtle\1fselect2\1f</Attr>
-                       <LegAttr>attr=grpnamROUTENAME\1f</LegAttr>
+                       <Attr><![CDATA[attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMTurtle\1flegnum64\1fusrmrkTurtle\1fselect2\1f]]></Attr>
+                       <LegAttr><![CDATA[attr=grpnamROUTENAME\1f]]></LegAttr>
                        <NumberOfVertexs>1</NumberOfVertexs>
                        <Latitude>-14.632647</Latitude>
-                       <Longitude>145.189251</Longitude>
+                       <Longitude>145.189250</Longitude>
                </Object>
                <Object>
                        <ClassName>waypnt</ClassName>
-                       <Attr>attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMNewton\1flegnum65\1fusrmrkNewton\1fselect2\1f</Attr>
-                       <LegAttr>attr=grpnamROUTENAME\1f</LegAttr>
+                       <Attr><![CDATA[attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMNewton\1flegnum65\1fusrmrkNewton\1fselect2\1f]]></Attr>
+                       <LegAttr><![CDATA[attr=grpnamROUTENAME\1f]]></LegAttr>
                        <NumberOfVertexs>1</NumberOfVertexs>
-                       <Latitude>-14.517176</Latitude>
-                       <Longitude>144.911975</Longitude>
+                       <Latitude>-14.517175</Latitude>
+                       <Longitude>144.911974</Longitude>
                </Object>
        </Route>
 </Export>

diff --git a/gpsbabel/reference/hsandv.exp b/gpsbabel/reference/hsandv.exp
index 78c979a7d870e935bccfe2521a1bbeca5dbb54b8..0f3b43070b9e893a16c4846db7556064c0ce571a 100644 (file)
--- a/gpsbabel/reference/hsandv.exp
+++ b/gpsbabel/reference/hsandv.exp
@@ -6,72 +6,72 @@
                <LastModified>0</LastModified>
                <Object>
                        <ClassName>waypnt</ClassName>
-                       <Attr>attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMGCEBB\1flegnum0\1fusrmrkMountain Bike Heaven by susy1313\1fselect2\1f</Attr>
-                       <LegAttr>attr=grpnamROUTENAME\1f</LegAttr>
+                       <Attr><![CDATA[attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMGCEBB\1flegnum0\1fusrmrkMountain Bike Heaven by susy1313\1fselect2\1f]]></Attr>
+                       <LegAttr><![CDATA[attr=grpnamROUTENAME\1f]]></LegAttr>
                        <NumberOfVertexs>1</NumberOfVertexs>
                        <Latitude>35.972033</Latitude>
                        <Longitude>-87.134700</Longitude>
                </Object>
                <Object>
                        <ClassName>waypnt</ClassName>
-                       <Attr>attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMGC1A37\1flegnum1\1fusrmrkThe Troll by a182pilot & Family\1fselect2\1f</Attr>
-                       <LegAttr>attr=grpnamROUTENAME\1f</LegAttr>
+                       <Attr><![CDATA[attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMGC1A37\1flegnum1\1fusrmrkThe Troll by a182pilot & Family\1fselect2\1f]]></Attr>
+                       <LegAttr><![CDATA[attr=grpnamROUTENAME\1f]]></LegAttr>
                        <NumberOfVertexs>1</NumberOfVertexs>
                        <Latitude>36.090683</Latitude>
                        <Longitude>-86.679550</Longitude>
                </Object>
                <Object>
                        <ClassName>waypnt</ClassName>
-                       <Attr>attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMGC1C2B\1flegnum2\1fusrmrkDive Bomber by JoGPS & family\1fselect2\1f</Attr>
-                       <LegAttr>attr=grpnamROUTENAME\1f</LegAttr>
+                       <Attr><![CDATA[attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMGC1C2B\1flegnum2\1fusrmrkDive Bomber by JoGPS & family\1fselect2\1f]]></Attr>
+                       <LegAttr><![CDATA[attr=grpnamROUTENAME\1f]]></LegAttr>
                        <NumberOfVertexs>1</NumberOfVertexs>
                        <Latitude>35.996267</Latitude>
                        <Longitude>-86.620117</Longitude>
                </Object>
                <Object>
                        <ClassName>waypnt</ClassName>
-                       <Attr>attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMGC25A9\1flegnum3\1fusrmrkFOSTER by JoGPS & Family\1fselect2\1f</Attr>
-                       <LegAttr>attr=grpnamROUTENAME\1f</LegAttr>
+                       <Attr><![CDATA[attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMGC25A9\1flegnum3\1fusrmrkFOSTER by JoGPS & Family\1fselect2\1f]]></Attr>
+                       <LegAttr><![CDATA[attr=grpnamROUTENAME\1f]]></LegAttr>
                        <NumberOfVertexs>1</NumberOfVertexs>
                        <Latitude>36.038483</Latitude>
                        <Longitude>-86.648617</Longitude>
                </Object>
                <Object>
                        <ClassName>waypnt</ClassName>
-                       <Attr>attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMGC2723\1flegnum4\1fusrmrkLogan Lighthouse by JoGps & Family\1fselect2\1f</Attr>
-                       <LegAttr>attr=grpnamROUTENAME\1f</LegAttr>
+                       <Attr><![CDATA[attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMGC2723\1flegnum4\1fusrmrkLogan Lighthouse by JoGps & Family\1fselect2\1f]]></Attr>
+                       <LegAttr><![CDATA[attr=grpnamROUTENAME\1f]]></LegAttr>
                        <NumberOfVertexs>1</NumberOfVertexs>
                        <Latitude>36.112183</Latitude>
                        <Longitude>-86.741767</Longitude>
                </Object>
                <Object>
                        <ClassName>waypnt</ClassName>
-                       <Attr>attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMGC2B71\1flegnum5\1fusrmrkGanier Cache by Susy1313\1fselect2\1f</Attr>
-                       <LegAttr>attr=grpnamROUTENAME\1f</LegAttr>
+                       <Attr><![CDATA[attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMGC2B71\1flegnum5\1fusrmrkGanier Cache by Susy1313\1fselect2\1f]]></Attr>
+                       <LegAttr><![CDATA[attr=grpnamROUTENAME\1f]]></LegAttr>
                        <NumberOfVertexs>1</NumberOfVertexs>
                        <Latitude>36.064083</Latitude>
                        <Longitude>-86.790517</Longitude>
                </Object>
                <Object>
                        <ClassName>waypnt</ClassName>
-                       <Attr>attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMGC309F\1flegnum6\1fusrmrkShy's Hill by FireFighterEng33\1fselect2\1f</Attr>
-                       <LegAttr>attr=grpnamROUTENAME\1f</LegAttr>
+                       <Attr><![CDATA[attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMGC309F\1flegnum6\1fusrmrkShy's Hill by FireFighterEng33\1fselect2\1f]]></Attr>
+                       <LegAttr><![CDATA[attr=grpnamROUTENAME\1f]]></LegAttr>
                        <NumberOfVertexs>1</NumberOfVertexs>
                        <Latitude>36.087767</Latitude>
                        <Longitude>-86.809733</Longitude>
                </Object>
                <Object>
                        <ClassName>waypnt</ClassName>
-                       <Attr>attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMGC317A\1flegnum7\1fusrmrkGittyUp by JoGPS / Warner Parks\1fselect2\1f</Attr>
-                       <LegAttr>attr=grpnamROUTENAME\1f</LegAttr>
+                       <Attr><![CDATA[attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMGC317A\1flegnum7\1fusrmrkGittyUp by JoGPS / Warner Parks\1fselect2\1f]]></Attr>
+                       <LegAttr><![CDATA[attr=grpnamROUTENAME\1f]]></LegAttr>
                        <NumberOfVertexs>1</NumberOfVertexs>
                        <Latitude>36.057500</Latitude>
                        <Longitude>-86.892000</Longitude>
                </Object>
                <Object>
                        <ClassName>waypnt</ClassName>
-                       <Attr>attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMGC317D\1flegnum8\1fusrmrkInlighting by JoGPS / Warner Parks\1fselect2\1f</Attr>
-                       <LegAttr>attr=grpnamROUTENAME\1f</LegAttr>
+                       <Attr><![CDATA[attr=grpnamROUTENAME\1ftrnrad50\1fOBJNAMGC317D\1flegnum8\1fusrmrkInlighting by JoGPS / Warner Parks\1fselect2\1f]]></Attr>
+                       <LegAttr><![CDATA[attr=grpnamROUTENAME\1f]]></LegAttr>
                        <NumberOfVertexs>1</NumberOfVertexs>
                        <Latitude>36.082800</Latitude>
                        <Longitude>-86.867283</Longitude>